From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 23 Apr 2019 16:36:35 +0000 (+0000)
Subject: ci: Fix checking out mutter for stable branches
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~845^2^2~245
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=594a07002911a3f8ef4337ec1d034fd37713b28c;p=gnome-shell.git

ci: Fix checking out mutter for stable branches

Remote branches always start with the remote itself, so just looking
for "gnome-3-32" etc. won't produce a match.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/509
---

diff --git a/.gitlab-ci/checkout-mutter.sh b/.gitlab-ci/checkout-mutter.sh
index 6539d80ea..7eb5c2974 100755
--- a/.gitlab-ci/checkout-mutter.sh
+++ b/.gitlab-ci/checkout-mutter.sh
@@ -23,7 +23,7 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
 fi
 
 if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l $shell_branch)
+  mutter_target=$(git branch -r -l origin/$shell_branch)
   mutter_target=${mutter_target:-origin/master}
   echo Using $mutter_target instead
 fi